merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Tue, 3 Apr 2007 19:04:51 +0000 (13:04 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 3 Apr 2007 19:04:51 +0000 (13:04 -0600)

Trivial merge